From: Florian Müllner <fmuellner@gnome.org>
Date: Sun, 3 Feb 2013 20:53:33 +0000 (+0100)
Subject: loginManager: Make suspend() a NOP in the ConsoleKit path
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~4955
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=b91d9c2867952520e685d689f75bc019befcaaf3;p=gnome-shell.git

loginManager: Make suspend() a NOP in the ConsoleKit path

UPower will remove its suspend support eventually, and g-s-d already
depends on logind for power management.

https://bugzilla.gnome.org/show_bug.cgi?id=693162
---

diff --git a/js/misc/loginManager.js b/js/misc/loginManager.js
index d1c7bd9bf..fd10c6853 100644
--- a/js/misc/loginManager.js
+++ b/js/misc/loginManager.js
@@ -5,7 +5,6 @@ const Gio = imports.gi.Gio;
 const Lang = imports.lang;
 const Mainloop = imports.mainloop;
 const Shell = imports.gi.Shell;
-const UPowerGlib = imports.gi.UPowerGlib;
 
 const SystemdLoginManagerIface = <interface name='org.freedesktop.login1.Manager'>
 <method name='PowerOff'>
@@ -150,7 +149,6 @@ const LoginManagerConsoleKit = new Lang.Class({
         this._proxy = new ConsoleKitManager(Gio.DBus.system,
                                             'org.freedesktop.ConsoleKit',
                                             '/org/freedesktop/ConsoleKit/Manager');
-        this._upClient = new UPowerGlib.Client();
     },
 
     // Having this function is a bit of a hack since the Systemd and ConsoleKit
@@ -186,10 +184,7 @@ const LoginManagerConsoleKit = new Lang.Class({
     },
 
     canSuspend: function(asyncCallback) {
-        Mainloop.idle_add(Lang.bind(this, function() {
-            asyncCallback(this._upClient.get_can_suspend());
-            return false;
-        }));
+        return false;
     },
 
     powerOff: function() {
@@ -201,6 +196,5 @@ const LoginManagerConsoleKit = new Lang.Class({
     },
 
     suspend: function() {
-        this._upClient.suspend_sync(null);
     }
 });